From 2a1ec27f9d574e73f93b9daa9785da8c9098f53f Mon Sep 17 00:00:00 2001
From: JAM <272807+JessieAMorris@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:12:48 -0700
Subject: [PATCH] Add JAVA_OPTS to the args

---
 charts/philter/Chart.yaml                            | 2 +-
 charts/philter/templates/ph-eye/deployment.yaml      | 6 ++++++
 charts/philter/templates/philter-api/deployment.yaml | 8 ++++++++
 charts/philter/templates/philter-ui/deployment.yaml  | 7 +++++++
 charts/philter/values.yaml                           | 8 ++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/charts/philter/Chart.yaml b/charts/philter/Chart.yaml
index b306fc7..8987ef8 100644
--- 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.11
+version: 0.1.13
 
 # 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/ph-eye/deployment.yaml b/charts/philter/templates/ph-eye/deployment.yaml
index 81c3d37..e996d61 100644
--- a/charts/philter/templates/ph-eye/deployment.yaml
+++ b/charts/philter/templates/ph-eye/deployment.yaml
@@ -37,6 +37,12 @@ spec:
             {{- toYaml .Values.phEye.securityContext | nindent 12 }}
           image: "{{ .Values.phEye.image.repository }}:{{ .Values.phEye.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.phEye.image.pullPolicy }}
+
+          {{- with .Values.phEye.args }}
+          args:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+
           {{- with .Values.phEye.env }}
           env:
             {{- toYaml . | nindent 12 }}
diff --git a/charts/philter/templates/philter-api/deployment.yaml b/charts/philter/templates/philter-api/deployment.yaml
index 06b5e43..86b72b2 100644
--- a/charts/philter/templates/philter-api/deployment.yaml
+++ b/charts/philter/templates/philter-api/deployment.yaml
@@ -40,10 +40,18 @@ spec:
             {{- toYaml .Values.api.securityContext | nindent 12 }}
           image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.api.image.pullPolicy }}
+
+          args:
+            - "$JAVA_OPTS"
+            {{- with .Values.api.args }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+
           {{- with .Values.api.env }}
           env:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+
           ports:
             - name: http
               containerPort: {{ .Values.api.service.port }}
diff --git a/charts/philter/templates/philter-ui/deployment.yaml b/charts/philter/templates/philter-ui/deployment.yaml
index edc9001..8081d6b 100644
--- a/charts/philter/templates/philter-ui/deployment.yaml
+++ b/charts/philter/templates/philter-ui/deployment.yaml
@@ -37,6 +37,13 @@ spec:
             {{- toYaml .Values.ui.securityContext | nindent 12 }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+
+          args:
+            - "$JAVA_OPTS"
+            {{- with .Values.ui.args }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+
           env:
             - name: PHILTER_ENDPOINT
               value: "{{ .Values.ui.apiEndpointOverride | default $defaultApiEndpoint }}"
diff --git a/charts/philter/values.yaml b/charts/philter/values.yaml
index 294510f..644cd17 100644
--- a/charts/philter/values.yaml
+++ b/charts/philter/values.yaml
@@ -151,6 +151,8 @@ api:
     # runAsNonRoot: true
     # runAsUser: 1000
 
+  args: []
+
   env: []
 
   service:
@@ -233,6 +235,8 @@ ui:
     # runAsNonRoot: true
     # runAsUser: 1000
 
+  args: []
+
   env: []
 
   apiEndpointOverride:
@@ -319,6 +323,8 @@ phEye:
     # runAsNonRoot: true
     # runAsUser: 1000
 
+  args: []
+
   env: []
 
   apiEndpointOverride:
@@ -337,10 +343,12 @@ phEye:
 
   # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
   livenessProbe:
+    initialDelaySeconds: 30
     httpGet:
       path: /status
       port: http
   readinessProbe:
+    initialDelaySeconds: 30
     httpGet:
       path: /status
       port: http