From 5fe207518ccaecfa36ff3bf3100a9dbed67af95e Mon Sep 17 00:00:00 2001 From: Maia Iyer Date: Tue, 6 Jun 2023 16:07:19 -0400 Subject: [PATCH 1/2] Add compatibility matrix Signed-off-by: Maia Iyer --- USAGE.md | 8 ++++++++ .../backend-sidecar-server-statefulset.yaml | 2 +- .../tornjak-sidecar-server-statefulset.yaml | 2 +- docs/quickstart/server-statefulset.yaml | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/USAGE.md b/USAGE.md index 6b007f3b..5e724b7e 100644 --- a/USAGE.md +++ b/USAGE.md @@ -10,6 +10,14 @@ NOTE: Previously, we had images placing the Tornjak backend and SPIRE server in Pre-built images can be found at the above links. To decide which tag to use, typically choose a release from [this page](https://github.com/spiffe/tornjak/releases) and choose the corresponding tag. For example, if you are interested in release `tornjak-1.0.2`, then choose image tag `v1.0.2`. +### Compatibility Table + +Please see below for compatibility charts of SPIRE server versions with Tornjak: + +| Tornjak version | SPIRE Server version | +| :-------------- | :------------------- | +| v1.1.x, v1.2.x | v1.1.x, v1.2.x, v1.3.x, v1.4.x | + ## Tornjak Backend This is meant to be deployed where it can access a SPIRE server. To run, the container has three arguments: diff --git a/docs/quickstart/server-statefulset-examples/backend-sidecar-server-statefulset.yaml b/docs/quickstart/server-statefulset-examples/backend-sidecar-server-statefulset.yaml index 83a56dba..31a2f393 100644 --- a/docs/quickstart/server-statefulset-examples/backend-sidecar-server-statefulset.yaml +++ b/docs/quickstart/server-statefulset-examples/backend-sidecar-server-statefulset.yaml @@ -51,7 +51,7 @@ spec: periodSeconds: 5 ### 👈 BEGIN ADDITIONAL CONTAINER ### - name: tornjak-backend - image: ghcr.io/spiffe/tornjak-backend:latest + image: ghcr.io/spiffe/tornjak-backend:v1.2.2 args: - --spire-config - /run/spire/config/server.conf diff --git a/docs/quickstart/server-statefulset-examples/tornjak-sidecar-server-statefulset.yaml b/docs/quickstart/server-statefulset-examples/tornjak-sidecar-server-statefulset.yaml index 730e6900..a3a1a690 100644 --- a/docs/quickstart/server-statefulset-examples/tornjak-sidecar-server-statefulset.yaml +++ b/docs/quickstart/server-statefulset-examples/tornjak-sidecar-server-statefulset.yaml @@ -51,7 +51,7 @@ spec: periodSeconds: 5 ### 👈 BEGIN ADDITIONAL CONTAINER ### - name: tornjak - image: ghcr.io/spiffe/tornjak:latest + image: ghcr.io/spiffe/tornjak:v1.2.2 imagePullPolicy: Always args: - --spire-config diff --git a/docs/quickstart/server-statefulset.yaml b/docs/quickstart/server-statefulset.yaml index fd1eedf6..629c4ac9 100644 --- a/docs/quickstart/server-statefulset.yaml +++ b/docs/quickstart/server-statefulset.yaml @@ -20,7 +20,7 @@ spec: serviceAccountName: spire-server containers: - name: spire-server - image: ghcr.io/spiffe/spire-server:1.5.1 + image: ghcr.io/spiffe/spire-server:1.4.4 args: - -config - /run/spire/config/server.conf From 6d2e98f3310b066474908dfa7022b557be2219d2 Mon Sep 17 00:00:00 2001 From: Maia Iyer Date: Tue, 6 Jun 2023 16:08:27 -0400 Subject: [PATCH 2/2] Adding v1.3 Signed-off-by: Maia Iyer --- USAGE.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/USAGE.md b/USAGE.md index 5e724b7e..b17a0090 100644 --- a/USAGE.md +++ b/USAGE.md @@ -14,9 +14,9 @@ Pre-built images can be found at the above links. To decide which tag to use, ty Please see below for compatibility charts of SPIRE server versions with Tornjak: -| Tornjak version | SPIRE Server version | -| :-------------- | :------------------- | -| v1.1.x, v1.2.x | v1.1.x, v1.2.x, v1.3.x, v1.4.x | +| Tornjak version | SPIRE Server version | +| :--------------------- | :------------------- | +| v1.1.x, v1.2.x, v1.3.x | v1.1.x, v1.2.x, v1.3.x, v1.4.x | ## Tornjak Backend