panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use good and automatic defaults for tornjak frontend workingDir (#129)

Browse Source 
Signed-off-by: Kevin Fox <[email protected]>
Signed-off-by: kfox1111 <[email protected]>
This commit is contained in:
kfox1111
2023-12-11 07:52:44 -08:00
committed by GitHub
parent 7726351955
commit 9f72a8f971
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/tornjak-frontend/README.md
+1 -1
View File
@@ -87,7 +87,7 @@ port forwarding. See the chart NOTES output for more details.
| `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | | `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` |
| `startupProbe.failureThreshold` | Failure threshold count for startupProbe | `6` | | `startupProbe.failureThreshold` | Failure threshold count for startupProbe | `6` |
| `startupProbe.successThreshold` | Success threshold count for startupProbe | `1` | | `startupProbe.successThreshold` | Success threshold count for startupProbe | `1` |
| `workingDir` | Path containing the Tornjak frontend within the image | `/usr/src/app` | | `workingDir` | Set to override the default path containing the Tornjak frontend within the image | `""` |
| `ingress.enabled` | Flag to enable ingress for Tornjak frontend service | `false` | | `ingress.enabled` | Flag to enable ingress for Tornjak frontend service | `false` |
| `ingress.className` | Ingress class name for Tornjak frontend service | `""` | | `ingress.className` | Ingress class name for Tornjak frontend service | `""` |
| `ingress.controllerType` | Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, autodetection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""]. | `""` | | `ingress.controllerType` | Specify what type of ingress controller you're using to add the necessary annotations accordingly. If blank, autodetection is attempted. If other, no annotations will be added. Must be one of [ingress-nginx, openshift, other, ""]. | `""` |
charts/spire/charts/tornjak-frontend/templates/_helpers.tpl
+10
View File
@@ -84,3 +84,13 @@ Create URL for accessing Tornjak APIs
{{- print "http://localhost:" .Values.service.port }} {{- print "http://localhost:" .Values.service.port }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- define "tornjak-frontend.workingDir" }}
{{- if .Values.workingDir }}
{{- .Values.workingDir }}
{{- else if (dig "openshift" false .Values.global) }}
{{- printf "/opt/app-root/src" }}
{{- else }}
{{- printf "/usr/src/app" }}
{{- end }}
{{- end }}
charts/spire/charts/tornjak-frontend/templates/deployment.yaml
+2 -2
View File
@@ -53,9 +53,9 @@ spec:
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- name: cache - name: cache
mountPath: {{ .Values.workingDir }}/node_modules/.cache mountPath: {{ include "tornjak-frontend.workingDir" . }}/node_modules/.cache
- name: env - name: env
mountPath: {{ .Values.workingDir }}/build/tmp mountPath: {{ include "tornjak-frontend.workingDir" . }}/build/tmp
- name: logs - name: logs
mountPath: /opt/app-root/src/.npm/ mountPath: /opt/app-root/src/.npm/
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
charts/spire/charts/tornjak-frontend/values.yaml
+2 -2
View File
@@ -113,8 +113,8 @@ startupProbe:
failureThreshold: 6 failureThreshold: 6
successThreshold: 1 successThreshold: 1
## @param workingDir Path containing the Tornjak frontend within the image ## @param workingDir Set to override the default path containing the Tornjak frontend within the image
workingDir: /usr/src/app workingDir: ""
## @param ingress.enabled Flag to enable ingress for Tornjak frontend service ## @param ingress.enabled Flag to enable ingress for Tornjak frontend service
## @param ingress.className Ingress class name for Tornjak frontend service ## @param ingress.className Ingress class name for Tornjak frontend service
examples/openshift/openshift-values.yaml
-1
View File
@@ -50,7 +50,6 @@ spiffe-oidc-discovery-provider:
fsGroup: null fsGroup: null
tornjak-frontend: tornjak-frontend:
workingDir: /opt/app-root/src
podSecurityContext: podSecurityContext:
runAsUser: null runAsUser: null
runAsGroup: null runAsGroup: null