Add Tornjak #234

mrsabath · 2023-04-24T14:40:55Z

This PR integrates support for Tornjak components: API (backend) and UI (frontend).
Tornjak provides an easy and intuitive graphical user interface and control plane for SPIRE.

Rename tornjak-be to tornjak-backend to follow same conventions as frontend
Add secured ingress, optionally…

mrsabath · 2023-04-25T16:20:28Z

@marcofranssen I don't think we have any reference to tornjak-be other than ghcr.io/spiffe/tornjak-be image name. The same image name style applies for Frontend. Both of these would have to be update on the Tornjak repo level, which we already requested here: spiffe/tornjak#169

marcofranssen · 2023-04-25T20:11:32Z

I think I saw it somewhere in the labels or something. Will double check.

charts/spire/charts/spire-server/templates/_helpers.tpl

marcofranssen

Found a couple small indentation issues which where resolved recently in other assets as well. See the suggestions. From the files tab you can bundle those in a single commit.

charts/spire/charts/spire-server/templates/tests/test-tornjak-connection.yaml

charts/spire/charts/spire-server/templates/tornjak-config.yaml

charts/spire/charts/tornjak-frontend/templates/service.yaml

marcofranssen · 2023-05-12T09:06:36Z

Testing from this branch I found following:

I have applied using the examples/tornjak/values.yaml

Then I ran kubectl -n spire-system port-forward service/spire-tornjak-frontend 3000:3000

Looking at the logs I see:

Frontend

> tornjak-frontend@0.1.0 start
> PORT=$PORT_FE react-scripts start --openssl-legacy-provider

ℹ ｢wds｣: Project is running at http://10.2.10.84/
ℹ ｢wds｣: webpack output is served from 
ℹ ｢wds｣: Content not from webpack is served from /usr/src/app/public
ℹ ｢wds｣: 404s will fallback to /
Starting the development server...

Compiled successfully!

Backend

-c /run/spire/config/server.conf -t /run/spire/tornjak-config/server.conf
/run/spire/config/server.conf
/run/spire/tornjak-config/server.conf
Starting to listen on :10000...
{map[DataStore:[sql] KeyManager:[disk] NodeAttestor:[k8s_psat] Notifier:[k8sbundle]] eu-west-1-swat-ops.swat-prototyping.com Plugin Info
DataStore Plugin: sql
Data: "connection_string" = "/run/spire/data/datastore.sqlite3"

"database_type" = "sqlite3"

KeyManager Plugin: disk
Data: "keys_path" = "/run/spire/data/keys.json"

marcofranssen · 2023-05-12T09:38:39Z

Made a fix for previous comment here #276

Open issues:

Error dialogs on the cluster managent tab
Spire cluster not listed in the cluster list
agents not listed in the agents tab

faisal-memon · 2023-05-15T01:48:48Z

Is it possible to deploy tornjak as a separate statefulset? If so, this would be a good one to break out into a subchart.

charts/spire/charts/spire-server/README.md

marcofranssen · 2023-05-15T09:41:16Z

Is it possible to deploy tornjak as a separate statefulset? If so, this would be a good one to break out into a subchart.

Tornjak requires just like the controller manager access to the spire-server socket and can therefore not run in another pod.

This reverts commit 3210dfe. Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Signed-off-by: Marco Franssen <marco.franssen@gmail.com> Co-authored-by: Marco Franssen <marco.franssen@gmail.com>

Resolves issue #223 Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Signed-off-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov> Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Co-authored-by: kfox1111 <Kevin.Fox@pnnl.gov>

This pr updates the Tornjak branch to work with the merged global registry configuration support. Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>

…ce exhaustion Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

- Align tornjak backend naming with same convention as frontend - Align Tornjak backend and frontend notes style - Add disclaimer for Tornjak usage to example --------- Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

…connection.yaml Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Co-authored-by: Marco Franssen <marco.franssen@gmail.com>

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

marcofranssen

Retested and now the agents are visible in my cluster.

kfox1111

Some issues still to resolve.

charts/spire/charts/spire-server/README.md

charts/spire/README.md

kfox1111 · 2023-05-16T18:01:29Z

charts/spire/charts/spire-server/templates/tornjak-config.yaml

+data:
+  server.conf: |
+    server {
+      metadata = "insert metadata"


Is this something that should be configurable? Not sure what it is.

kfox1111 · 2023-05-16T18:04:55Z

charts/spire/charts/tornjak-frontend/templates/_helpers.tpl

+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "tornjak-frontend.cluster-domain" -}}


This is now a spire-lib macro. It can be removed here and used directly in the rest of the template

kfox1111 · 2023-05-16T18:06:43Z

charts/spire/charts/tornjak-frontend/templates/tests/test-tornjak-connection.yaml

+    - name: curl-tornjak-frontend
+      image: cgr.dev/chainguard/bash:latest
+      command: ['curl']
+      args: ['-k', '-s', '-f', 'http://{{ include "tornjak-frontend.fullname" . }}.{{ include "tornjak-frontend.namespace" . }}.svc.{{ include "tornjak-frontend.cluster-domain" . }}:{{ .Values.service.port }}']


Should use spire-lib.cluster-domain here.

* c1c5b11 Merge pull request #306 from spiffe/remove-1.21 * 0df45e3 Fix up docs * ed038fe Upgrade to spire 1.6.4 (#308) * dc5d9cf Fix root README.md * e4447fd Upgrade Tornjak to new image v1.2.1 (#299) * 69f402e Update docs * 38d51d5 Apply suggestions from code review * a1ba235 Update docs * 1922085 Fix hooks for K3s (#305) * 4fb549e Remove 1.21.x testing * 88efc77 Allow to use spire-server as an upstream authority (#304) * 0ba0388 Add support for spire-server ingress (#68) * 4777a30 Bump test chart dependencies (#301) * 00c2c1a Fix the generated pr so that it runs jobs too (#303) * dd1ad49 Update images for cve's found by the cronjob (#290) * 1c69470 Updated Tornjak documenation with Not-for-production labels (#297) * 7809637 Merge pull request #296 from spiffe/dependabot/github_actions/helm/kind-action-1.7.0 * e61ed17 Merge pull request #295 from spiffe/dependabot/github_actions/sigstore/cosign-installer-3.0.5 * 9975e58 Merge pull request #245 from spiffe/tags * 7bb7ece Bump helm/kind-action from 1.6.0 to 1.7.0 * f1623a5 Bump sigstore/cosign-installer from 3.0.4 to 3.0.5 * f8db5a3 Fix Tornjak persistence issue (#294) * b30b412 Tornjak reuse spire-lib.cluster-domain macro (#292) * 90c9eb5 Fix kubectl-image macro to handle version deprecation * 300d1cc Apply deprecation of image.version to Tornjak * d850486 Instead of removing version, first deprecate version * 59e422b Add documentation for all image.tag values * d1f3cdb Switch image.version to image.tag * 31ce704 Cleanup maintainer handbook (#287) * a2da943 Remove manual dispatch from dummy workflow (#288) * 807558b Bump helm/kind-action from 1.5.0 to 1.6.0 (#285) * 3df67db Bump sigstore/cosign-installer from 3.0.3 to 3.0.4 (#286) * 5505d41 Merge pull request #283 from spiffe/additional-k8s-native-feature-tornjak-frontend * 391f093 Allow to configure topologySpreadConstraints for tornjak-frontend * 5cc26d3 Allow to configure tolerations for tornjak-frontend * 3537161 Allow to configure affinity for tornjak-frontend * aed6fdf Use the correct kubectl for the cluster (#248) * ee43c5e Add nodeSelector for tornjak * fc13cbd Merge pull request #234 from spiffe/tornjak * ed472aa Update documentation * a11cfc9 Allow to define the resources for tornjak backend * 382e0d4 Upgrade Tornjak image to version v1.2.0 (#259) * 657c460 Update charts/spire/charts/tornjak-frontend/templates/service.yaml * 7521caf Update charts/spire/charts/spire-server/templates/tornjak-config.yaml * b64c352 Update charts/spire/charts/spire-server/templates/tests/test-tornjak-connection.yaml * 6ddf6ab Improve tornjak docs (#276) * 80d34f0 Use common post-install scripts for testing * f5efa0c Remove dead macros * bd86518 Fixing shellcheck * 91bdea2 Provide minimal resources to prevent accidental crashes due to resource exhaustion * 1675997 Tornjak global image fix (#228) * 5e827ee Add Tornjak Tests (#220) * bdba97b Add empty directory to Tornjak to support npm cache (#224) * da186c5 Split Tornjak Frontend into separate subchart (#179) * 6d22126 Add Tornjak * 2669d8b Add maintainer's handbook. (#265) * 72596ae Skip tests for docs folders (#281) * 7c71738 Bump test chart dependencies (#279) * 05addae Add json to test path (#280) * 8d9b734 Switch the spire tests to always run (#250) Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

marcofranssen force-pushed the tornjak branch 3 times, most recently from f1f0fe2 to 5897b52 Compare April 24, 2023 16:03

mrsabath mentioned this pull request Apr 24, 2023

Convert image names to spell out the component name spiffe/tornjak#169

Closed

marcofranssen force-pushed the tornjak branch from 34b8603 to 5192ed2 Compare April 24, 2023 18:39

marcofranssen added this to the 0.9.x milestone Apr 25, 2023

kfox1111 reviewed May 1, 2023

View reviewed changes

charts/spire/charts/spire-server/templates/_helpers.tpl Outdated Show resolved Hide resolved

kfox1111 reviewed May 1, 2023

View reviewed changes

charts/spire/charts/spire-server/templates/_helpers.tpl Outdated Show resolved Hide resolved

marcofranssen force-pushed the tornjak branch from c281ea6 to 2fb5282 Compare May 12, 2023 07:04

marcofranssen suggested changes May 12, 2023

View reviewed changes

marcofranssen changed the title ~~Add support for Tornjak components~~ Add Tornjak May 12, 2023

mrsabath force-pushed the tornjak branch from 3713565 to 3a9ef00 Compare May 12, 2023 16:47

mrsabath self-assigned this May 12, 2023

mrsabath marked this pull request as ready for review May 12, 2023 17:30

mrsabath requested review from developer-guy, dfeldman and faisal-memon as code owners May 12, 2023 17:30

edwbuck self-requested a review as a code owner May 12, 2023 19:11

mrsabath force-pushed the tornjak branch from 097c8b6 to 8c5cba0 Compare May 12, 2023 22:47

faisal-memon reviewed May 15, 2023

View reviewed changes

charts/spire/charts/spire-server/README.md Show resolved Hide resolved

faisal-memon modified the milestones: 0.9.x, 0.8.x May 15, 2023

marcofranssen force-pushed the tornjak branch from 8c5cba0 to 16b639e Compare May 15, 2023 12:08

Add Tornjak

6d22126

This reverts commit 3210dfe. Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

mrsabath and others added 15 commits May 16, 2023 19:31

Split Tornjak Frontend into separate subchart (#179)

da186c5

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Signed-off-by: Marco Franssen <marco.franssen@gmail.com> Co-authored-by: Marco Franssen <marco.franssen@gmail.com>

Add empty directory to Tornjak to support npm cache (#224)

bdba97b

Resolves issue #223 Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Add Tornjak Tests (#220)

5e827ee

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Signed-off-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov> Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Co-authored-by: kfox1111 <Kevin.Fox@pnnl.gov>

Tornjak global image fix (#228)

1675997

This pr updates the Tornjak branch to work with the merged global registry configuration support. Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Signed-off-by: kfox1111 <Kevin.Fox@pnnl.gov>

Provide minimal resources to prevent accidental crashes due to resour…

91bdea2

…ce exhaustion Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Fixing shellcheck

bd86518

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Remove dead macros

f5efa0c

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Use common post-install scripts for testing

80d34f0

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Improve tornjak docs (#276)

6ddf6ab

- Align tornjak backend naming with same convention as frontend - Align Tornjak backend and frontend notes style - Add disclaimer for Tornjak usage to example --------- Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

Update charts/spire/charts/spire-server/templates/tests/test-tornjak-…

b64c352

…connection.yaml Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Update charts/spire/charts/spire-server/templates/tornjak-config.yaml

7521caf

Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Update charts/spire/charts/tornjak-frontend/templates/service.yaml

657c460

Co-authored-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

Upgrade Tornjak image to version v1.2.0 (#259)

382e0d4

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com> Co-authored-by: Marco Franssen <marco.franssen@gmail.com>

Allow to define the resources for tornjak backend

a11cfc9

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

Update documentation

ed472aa

Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>

marcofranssen force-pushed the tornjak branch from 75fbe4f to ed472aa Compare May 16, 2023 17:31

marcofranssen enabled auto-merge May 16, 2023 17:52

marcofranssen approved these changes May 16, 2023

View reviewed changes

marcofranssen merged commit fc13cbd into main May 16, 2023
138 checks passed

marcofranssen deleted the tornjak branch May 16, 2023 17:53

kfox1111 reviewed May 16, 2023

View reviewed changes

kfox1111 mentioned this pull request May 16, 2023

Tornjak review issues. #284

Closed

4 tasks

marcofranssen mentioned this pull request May 25, 2023

Bump spire Helm Chart version from 0.7.0 to 0.8.0 #313

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Tornjak #234

Add Tornjak #234

mrsabath commented Apr 24, 2023 •

edited

Loading

mrsabath commented Apr 25, 2023

marcofranssen commented Apr 25, 2023

marcofranssen left a comment •

edited

Loading

marcofranssen commented May 12, 2023

marcofranssen commented May 12, 2023 •

edited

Loading

faisal-memon commented May 15, 2023

marcofranssen commented May 15, 2023

marcofranssen left a comment

kfox1111 left a comment

kfox1111 May 16, 2023

kfox1111 May 16, 2023

kfox1111 May 16, 2023

Add Tornjak #234

Add Tornjak #234

Conversation

mrsabath commented Apr 24, 2023 • edited Loading

mrsabath commented Apr 25, 2023

marcofranssen commented Apr 25, 2023

marcofranssen left a comment • edited Loading

Choose a reason for hiding this comment

marcofranssen commented May 12, 2023

Frontend

Backend

marcofranssen commented May 12, 2023 • edited Loading

faisal-memon commented May 15, 2023

marcofranssen commented May 15, 2023

marcofranssen left a comment

Choose a reason for hiding this comment

kfox1111 left a comment

Choose a reason for hiding this comment

kfox1111 May 16, 2023

Choose a reason for hiding this comment

kfox1111 May 16, 2023

Choose a reason for hiding this comment

kfox1111 May 16, 2023

Choose a reason for hiding this comment

mrsabath commented Apr 24, 2023 •

edited

Loading

marcofranssen left a comment •

edited

Loading

marcofranssen commented May 12, 2023 •

edited

Loading