Skip to content

Commit

Permalink
Add JAVA_OPTS to the args
Browse files Browse the repository at this point in the history
  • Loading branch information
JessieAMorris committed Dec 9, 2024
1 parent 0bca360 commit 2a1ec27
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion charts/philter/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions charts/philter/templates/ph-eye/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 8 additions & 0 deletions charts/philter/templates/philter-api/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
7 changes: 7 additions & 0 deletions charts/philter/templates/philter-ui/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
8 changes: 8 additions & 0 deletions charts/philter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ api:
# runAsNonRoot: true
# runAsUser: 1000

args: []

env: []

service:
Expand Down Expand Up @@ -233,6 +235,8 @@ ui:
# runAsNonRoot: true
# runAsUser: 1000

args: []

env: []

apiEndpointOverride:
Expand Down Expand Up @@ -319,6 +323,8 @@ phEye:
# runAsNonRoot: true
# runAsUser: 1000

args: []

env: []

apiEndpointOverride:
Expand All @@ -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
Expand Down

0 comments on commit 2a1ec27

Please sign in to comment.