diff --git a/.github/tests/tornjak/post-install.sh b/.github/tests/tornjak/post-install.sh index 69ca32e..c5040ec 100755 --- a/.github/tests/tornjak/post-install.sh +++ b/.github/tests/tornjak/post-install.sh @@ -12,7 +12,7 @@ source "${SCRIPTPATH}/../common.sh" print_helm_releases print_spire_workload_status spire-server spire-system -kubectl rollout status --watch --timeout 30s --namespace spire-server deployments.apps spire-tornjak-frontend +kubectl rollout status --watch --timeout 180s --namespace spire-server deployments.apps spire-tornjak-frontend kubectl -n spire-server get deploy spire-tornjak-frontend kubectl -n spire-server get service spire-tornjak-frontend diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index 0eef5fb..7c051c3 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -108,8 +108,8 @@ A Helm chart to install the SPIRE server. | topologySpreadConstraints | list | `[]` | | | tornjak.config.dataStore | object | `{"driver":"sqlite3","file":"/run/spire/data/tornjak.sqlite3"}` | persistent DB for storing Tornjak specific information | | tornjak.enabled | bool | `false` | Deploys Tornjak API (backend) | -| tornjak.image | object | `{"pullPolicy":"IfNotPresent","registry":"ghcr.io","repository":"spiffe/tornjak-be","version":"v1.0.2"}` | Tornjak API image | -| tornjak.image.version | string | `"v1.0.2"` | Overrides the image tag whose default is the chart appVersion. | +| tornjak.image | object | `{"pullPolicy":"IfNotPresent","registry":"ghcr.io","repository":"spiffe/tornjak-backend","version":"v1.2.0"}` | Tornjak API image | +| tornjak.image.version | string | `"v1.2.0"` | Overrides the image tag whose default is the chart appVersion. | | tornjak.service.annotations | object | `{}` | | | tornjak.service.port | int | `10000` | | | tornjak.service.type | string | `"ClusterIP"` | | diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 2ff322b..904dcc1 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -263,10 +263,10 @@ tornjak: # -- Tornjak API image image: registry: ghcr.io - repository: spiffe/tornjak-be + repository: spiffe/tornjak-backend pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. - version: "v1.0.2" + version: "v1.2.0" service: type: ClusterIP port: 10000 diff --git a/charts/spire/charts/tornjak-frontend/Chart.yaml b/charts/spire/charts/tornjak-frontend/Chart.yaml index 9b77c93..15167cf 100644 --- a/charts/spire/charts/tornjak-frontend/Chart.yaml +++ b/charts/spire/charts/tornjak-frontend/Chart.yaml @@ -3,7 +3,7 @@ name: tornjak-frontend description: A Helm chart to deploy Tornjak frontend type: application version: 0.1.0 -appVersion: "v1.0.2" +appVersion: "v1.2.0" home: https://github.com/spiffe/helm-charts/tree/main/charts/spire sources: - https://github.com/spiffe/tornjak diff --git a/charts/spire/charts/tornjak-frontend/README.md b/charts/spire/charts/tornjak-frontend/README.md index c5255c1..fba5649 100644 --- a/charts/spire/charts/tornjak-frontend/README.md +++ b/charts/spire/charts/tornjak-frontend/README.md @@ -2,7 +2,7 @@ -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.2](https://img.shields.io/badge/AppVersion-v1.0.2-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.2.0](https://img.shields.io/badge/AppVersion-v1.2.0-informational?style=flat-square) [![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development) A Helm chart to deploy Tornjak frontend @@ -53,7 +53,7 @@ port forwarding. See the chart NOTES output for more details. | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.registry | string | `"ghcr.io"` | | -| image.repository | string | `"spiffe/tornjak-fe"` | | +| image.repository | string | `"spiffe/tornjak-frontend"` | | | image.version | string | `""` | Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | | | labels | object | `{}` | | @@ -67,4 +67,5 @@ port forwarding. See the chart NOTES output for more details. | serviceAccount.annotations | object | `{}` | Annotations to add to the service account | | serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | +| spireHealthCheck.enabled | bool | `true` | Enables the SPIRE Healthchecker indicator | ---------------------------------------------- diff --git a/charts/spire/charts/tornjak-frontend/templates/NOTES.txt b/charts/spire/charts/tornjak-frontend/templates/NOTES.txt index 8e08f81..85a568e 100644 --- a/charts/spire/charts/tornjak-frontend/templates/NOTES.txt +++ b/charts/spire/charts/tornjak-frontend/templates/NOTES.txt @@ -9,6 +9,7 @@ Tornjak UI (Frontend) image: {{ template "spire-lib.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image "global" .Values.global) }} pull policy: {{ .Values.image.pullPolicy }} Tornjak API (Backend): {{ include "tornjak-frontend.apiURL" . }} + SPIRE health check enabled: "{{ .Values.spireHealthCheck.enabled }}" ### WARNING ### diff --git a/charts/spire/charts/tornjak-frontend/templates/deployment.yaml b/charts/spire/charts/tornjak-frontend/templates/deployment.yaml index 116b9a1..141b771 100644 --- a/charts/spire/charts/tornjak-frontend/templates/deployment.yaml +++ b/charts/spire/charts/tornjak-frontend/templates/deployment.yaml @@ -35,15 +35,19 @@ spec: env: - name: REACT_APP_API_SERVER_URI value: {{ include "tornjak-frontend.apiURL" . }} + {{- if eq (.Values.spireHealthCheck.enabled | toString) "true" }} + - name: REACT_APP_SPIRE_HEALTH_CHECK_ENABLE + value: "{{ .Values.spireHealthCheck.enabled }}" + {{- end }} startupProbe: httpGet: scheme: HTTP port: {{ .Values.service.port }} failureThreshold: 6 - initialDelaySeconds: 60 - periodSeconds: 30 + initialDelaySeconds: 120 + periodSeconds: 45 successThreshold: 1 - timeoutSeconds: 10 + timeoutSeconds: 20 volumeMounts: - name: cache mountPath: /usr/src/app/node_modules/.cache diff --git a/charts/spire/charts/tornjak-frontend/values.yaml b/charts/spire/charts/tornjak-frontend/values.yaml index 0d1d645..896769f 100644 --- a/charts/spire/charts/tornjak-frontend/values.yaml +++ b/charts/spire/charts/tornjak-frontend/values.yaml @@ -4,7 +4,7 @@ image: registry: ghcr.io - repository: spiffe/tornjak-fe + repository: spiffe/tornjak-frontend pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. version: "" @@ -54,3 +54,9 @@ service: # Since Tornjak Frontend runs in the browser, this URL must be accessible from # the machine running a browser. apiServerURL: "http://localhost:10000/" # 👈 Use it for minikube or kind + +# SPIRE Healthchecker indicator +spireHealthCheck: + # -- Enables the SPIRE Healthchecker indicator + enabled: true +