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

Auto tornjak url (#89)

Browse Source 
* Autogen jwtIssuer

Unset a default for jwtIssuer and global.spire.jwtIssuer. When unset,
generate it to the default of oidc-discovery.$trustDomain so in many
cases the user doesn't need to set it at all.

Signed-off-by: Kevin Fox <[email protected]>

* Autogen tornjak's apiServerURL

Unset the default tornjak apiServerURL. When unset, default to
https://tornjak-backend.$trustDomain so in many cases users don't
have to set it.

Signed-off-by: Kevin Fox <[email protected]>

* Do more autodetection

Signed-off-by: Kevin Fox <[email protected]>

* Apply suggestions from code review

Co-authored-by: Faisal Memon <[email protected]>
Signed-off-by: kfox1111 <[email protected]>

* Fix docs

Signed-off-by: Kevin Fox <[email protected]>

---------

Signed-off-by: Kevin Fox <[email protected]>
Signed-off-by: kfox1111 <[email protected]>
Co-authored-by: Mariusz Sabath <[email protected]>
Co-authored-by: Faisal Memon <[email protected]>
This commit is contained in:
kfox1111
2023-11-09 13:07:52 -08:00
committed by GitHub
co-authored by Faisal Memon Mariusz Sabath
parent f2758a8b2b
commit 6c0a4fbb86
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/tornjak-frontend/README.md
+1 -1
View File
@@ -81,7 +81,7 @@ port forwarding. See the chart NOTES output for more details.
| `affinity` | Affinity rules | `{}` | | `affinity` | Affinity rules | `{}` |
| `tolerations` | List of tolerations | `[]` | | `tolerations` | List of tolerations | `[]` |
| `topologySpreadConstraints` | List of topology spread constraints for resilience | `[]` | | `topologySpreadConstraints` | List of topology spread constraints for resilience | `[]` |
| `apiServerURL` | URL of the Tornjak APIs (backend). Since Tornjak Frontend runs in the browser, this URL must be accessible from the machine running a browser. | `http://localhost:10000/` | | `apiServerURL` | URL of the Tornjak APIs (backend). Since Tornjak Frontend runs in the browser, this URL must be accessible from the machine running a browser. If unset, autodetection is atempted. | `""` |
| `spireHealthCheck.enabled` | Enables the SPIRE Healthchecker indicator | `true` | | `spireHealthCheck.enabled` | Enables the SPIRE Healthchecker indicator | `true` |
| `startupProbe.enabled` | Enable startupProbe on Tornjak frontend container | `true` | | `startupProbe.enabled` | Enable startupProbe on Tornjak frontend container | `true` |
| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `5` | | `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `5` |
charts/spire/charts/tornjak-frontend/templates/_helpers.tpl
+3 -2
View File
@@ -78,8 +78,9 @@ Create URL for accessing Tornjak APIs
{{- define "tornjak-frontend.apiURL" -}} {{- define "tornjak-frontend.apiURL" -}}
{{- if .Values.apiServerURL -}} {{- if .Values.apiServerURL -}}
{{- .Values.apiServerURL -}} {{- .Values.apiServerURL -}}
{{- else if .Values.ingress.enabled }}
{{- printf "https://tornjak-backend.%s" (include "spire-lib.trust-domain" .) }}
{{- else }} {{- else }}
{{- $feurl := print "http://localhost:" .Values.service.port }} {{- print "http://localhost:" .Values.service.port }}
{{- $feurl }}
{{- end }} {{- end }}
{{- end }} {{- end }}
charts/spire/charts/tornjak-frontend/values.yaml
+2 -2
View File
@@ -88,8 +88,8 @@ topologySpreadConstraints: []
# cpu: 100m # cpu: 100m
# memory: 512Mi # memory: 512Mi
## @param apiServerURL URL of the Tornjak APIs (backend). Since Tornjak Frontend runs in the browser, this URL must be accessible from the machine running a browser. ## @param apiServerURL URL of the Tornjak APIs (backend). Since Tornjak Frontend runs in the browser, this URL must be accessible from the machine running a browser. If unset, autodetection is atempted.
apiServerURL: "http://localhost:10000/" # 👈 Use it for minikube or kind apiServerURL: ""
# SPIRE Healthchecker indicator # SPIRE Healthchecker indicator
spireHealthCheck: spireHealthCheck:
examples/production/example-your-values.yaml
-4
View File
@@ -20,7 +20,3 @@ spire-server:
# ingress: # ingress:
# host: oidc-discovery # host: oidc-discovery
# tlsSecret: tls-cert # tlsSecret: tls-cert
tornjak-frontend:
apiServerURL: https://tornjak-backend.production.other/
examples/tornjak/values.yaml
-1
View File
@@ -7,7 +7,6 @@ tornjak-frontend:
service: service:
type: ClusterIP type: ClusterIP
port: 3000 port: 3000
apiServerURL: "http://localhost:10000/"
resources: resources:
requests: requests:
cpu: 50m cpu: 50m