Improve Tornjak NOTES. Fixes #132 (#354)

* Improve Tornjak NOTES. Fixes #132

Signed-off-by: Mariusz Sabath <[email protected]>

* Fix Tornjak ingress value

Signed-off-by: Mariusz Sabath <[email protected]>

---------

Signed-off-by: Mariusz Sabath <[email protected]>

charts/spire/charts/spire-server/templates/NOTES.txt

@@ -10,18 +10,27 @@ Get the currently registered SPIFFE entries from the server:
 Installed {{ include "spire-tornjak.fullname" . }}…
 
 {{- if eq .Values.tornjak.config.userManagement.issuer "" }}
+
   ### WARNING ###
 
   Tornjak is configured to run without authentication and is therefore NOT suitable to run in production environments.
   Only use in test environments!
 {{- end }}
 
-Access Tornjak:
-   kubectl -n {{ include "spire-server.namespace" . }} port-forward service/{{ include "spire-tornjak.servicename" . }} {{ .Values.tornjak.service.ports.http }}:10000
+Access Tornjak API (Backend):
+
+{{- if .Values.tornjak.ingress.enabled }}
+
+  Connect to: {{ printf "https://tornjak-backend.%s" (include "spire-lib.trust-domain" .) }}
+
+{{- else }}
+  kubectl -n {{ include "spire-server.namespace" . }} port-forward service/{{ include "spire-tornjak.servicename" . }} {{ .Values.tornjak.service.ports.http }}:10000
 {{- if eq (include "spire-tornjak.connectionType" .) "http" }}
-  Open browser to: http://localhost:{{ .Values.tornjak.service.ports.http }}
+
+  Connect to:  http://localhost:{{ .Values.tornjak.service.ports.http }}
 {{- else if eq (include "spire-tornjak.connectionType" .) "tls" }}
-  Open browser to: https://localhost:{{ .Values.tornjak.service.ports.https }}
+
+  Connect to: https://localhost:{{ .Values.tornjak.service.ports.https }}
 
   *** NOTE: You might get a security warning if using self-signed certificate
   or use curl:
@@ -37,3 +46,4 @@ Access Tornjak:
   ERROR! Incorrect value selected for "Values.tornjak.config.connectionType"
 {{- end }}
 {{- end }}
+{{- end }}

charts/spire/charts/tornjak-frontend/templates/NOTES.txt

@@ -15,19 +15,27 @@ Tornjak UI (Frontend)
 {{- if .Values.auth.enabled }}
   User Management API:  "{{ .Values.auth.serverURL }}"
 {{- else }}
+
   ### WARNING ###
 
   Tornjak is configured to run without authentication and is therefore NOT suitable to run in production environments.
   Only use in test environments!
 {{- end }}
 
-Access Tornjak:
+Access Tornjak UI:
+
+{{- if .Values.ingress.enabled }}
+
+Open browser to:
+{{ printf "https://tornjak-frontend.%s" (include "spire-lib.trust-domain" .) }}
+{{- else }}
 
   kubectl -n {{ include "tornjak-frontend.namespace" . }} port-forward service/{{ include "tornjak-frontend.fullname" . }} {{ .Values.service.port }}:3000
 
 Ensure you have port-forwarding for tornjak-backend as well.
 
 Open browser to: http://localhost:{{ .Values.service.port }}
+{{- end }}
 
 To learn more about the release, try: