From f85f001dee5aaa686afd9b1ae117a8e990a8d48c Mon Sep 17 00:00:00 2001 From: Jay Shaughnessy Date: Thu, 2 Nov 2023 16:50:12 -0400 Subject: [PATCH] Fix LeftHand TOC issue (caused by readfile) - replace readfile with custom shortcode for maistra compat be like what we have for istio compat - fix weights for Installation section --- .../Installation/installation-guide/_index.md | 2 +- .../compatibility-maistra.md | 13 ------ .../installation-guide/prerequisites.md | 4 +- data/compatibility/maistra.yaml | 43 +++++++++++++++++++ layouts/shortcodes/compat-table-maistra.html | 22 ++++++++++ 5 files changed, 68 insertions(+), 16 deletions(-) delete mode 100644 content/en/docs/Installation/installation-guide/compatibility-maistra.md create mode 100644 data/compatibility/maistra.yaml create mode 100644 layouts/shortcodes/compat-table-maistra.html diff --git a/content/en/docs/Installation/installation-guide/_index.md b/content/en/docs/Installation/installation-guide/_index.md index 34407c8c5..925d8966a 100644 --- a/content/en/docs/Installation/installation-guide/_index.md +++ b/content/en/docs/Installation/installation-guide/_index.md @@ -1,7 +1,7 @@ --- title: "Installation Guide" description: "Installing Kiali for production." -weight: 20 +weight: 10 --- This section describes the production installation methods available for Kiali. diff --git a/content/en/docs/Installation/installation-guide/compatibility-maistra.md b/content/en/docs/Installation/installation-guide/compatibility-maistra.md deleted file mode 100644 index 8022ec537..000000000 --- a/content/en/docs/Installation/installation-guide/compatibility-maistra.md +++ /dev/null @@ -1,13 +0,0 @@ -|
Maistra
|
SMCP CR
|
Kiali
|Notes| -|---|---|---|---| -|2.4 |2.4 |1.65 |Using Maistra 2.4 to install service mesh control plane 2.4 requires Kiali Operator v1.65. Other versions are not compatible. | -|2.4 |2.3 |1.57 |Using Maistra 2.4 to install service mesh control plane 2.3 requires Kiali Operator v1.65. Other versions are not compatible. | -|2.4 |2.2 |1.48 |Using Maistra 2.4 to install service mesh control plane 2.2 requires Kiali Operator v1.65. Other versions are not compatible. | -|2.3 |2.3 |1.57 |Using Maistra 2.3 to install service mesh control plane 2.3 requires Kiali Operator v1.57. Other versions are not compatible. | -|2.3 |2.2 |1.48 |Using Maistra 2.3 to install service mesh control plane 2.2 requires Kiali Operator v1.57. Other versions are not compatible. | -|2.2 |2.2 |1.48 |Using Maistra 2.2 to install service mesh control plane 2.2 requires Kiali Operator v1.48. Other versions are not compatible. | -|n/a |2.1 |n/a |Service mesh control plane 2.1 is out of support. | -|n/a |2.0 |n/a |Service mesh control plane 2.0 is out of support. | -|n/a |1.1 |n/a |Service mesh control plane 1.1 is out of support. | -|n/a |1.0 |n/a |Service mesh control plane 1.0 is out of support. | - diff --git a/content/en/docs/Installation/installation-guide/prerequisites.md b/content/en/docs/Installation/installation-guide/prerequisites.md index b37aeace6..be04f3352 100644 --- a/content/en/docs/Installation/installation-guide/prerequisites.md +++ b/content/en/docs/Installation/installation-guide/prerequisites.md @@ -1,7 +1,7 @@ --- title: "Prerequisites" description: "Hardware and Software compatibility and requirements." -weight: 10 +weight: 15 --- ## Istio @@ -44,7 +44,7 @@ supported Istio versions. ## Maistra Version Compatibility -{{% readfile file="/content/en/docs/Installation/installation-guide/compatibility-maistra.md" %}} +{{}}
diff --git a/data/compatibility/maistra.yaml b/data/compatibility/maistra.yaml new file mode 100644 index 000000000..5620ec4df --- /dev/null +++ b/data/compatibility/maistra.yaml @@ -0,0 +1,43 @@ +# The Compatible Version Matrix between Maistra and Kiali +# See: content/en/docs/Installation/installation-guide/prerequisites.md -> {{}} +versionRange: + - maistraVersion: "2.4" + smcpCRVersion: "2.4" + kialiVersion: "1.65" + notes: "Using Maistra 2.4 to install service mesh control plane 2.4 requires Kiali Operator v1.65. Other versions are not compatible." + - maistraVersion: "2.4" + smcpCRVersion: "2.3" + kialiVersion: "1.57" + notes: "Using Maistra 2.4 to install service mesh control plane 2.3 requires Kiali Operator v1.65. Other versions are not compatible." + - maistraVersion: "2.4" + smcpCRVersion: "2.2" + kialiVersion: "1.48" + notes: "Using Maistra 2.4 to install service mesh control plane 2.2 requires Kiali Operator v1.65. Other versions are not compatible." + - maistraVersion: "2.3" + smcpCRVersion: "2.3" + kialiVersion: "1.57" + notes: "Using Maistra 2.3 to install service mesh control plane 2.3 requires Kiali Operator v1.57. Other versions are not compatible." + - maistraVersion: "2.3" + smcpCRVersion: "2.2" + kialiVersion: "1.48" + notes: "Using Maistra 2.3 to install service mesh control plane 2.2 requires Kiali Operator v1.57. Other versions are not compatible." + - maistraVersion: "2.2" + smcpCRVersion: "2.2" + kialiVersion: "1.48" + notes: "Using Maistra 2.2 to install service mesh control plane 2.2 requires Kiali Operator v1.48. Other versions are not compatible." + - maistraVersion: "n/a" + smcpCRVersion: "2.1" + kialiVersion: "n/a" + notes: "Service mesh control plane 2.1 is out of support." + - maistraVersion: "n/a" + smcpCRVersion: "2.0" + kialiVersion: "n/a" + notes: "Service mesh control plane 2.0 is out of support." + - maistraVersion: "n/a" + smcpCRVersion: "1.1" + kialiVersion: "n/a" + notes: "Service mesh control plane 1.1 is out of support." + - maistraVersion: "n/a" + smcpCRVersion: "1.0" + kialiVersion: "n/a" + notes: "Service mesh control plane 1.0 is out of support." diff --git a/layouts/shortcodes/compat-table-maistra.html b/layouts/shortcodes/compat-table-maistra.html new file mode 100644 index 000000000..49570fb02 --- /dev/null +++ b/layouts/shortcodes/compat-table-maistra.html @@ -0,0 +1,22 @@ +{{ $data := index .Site.Data.compatibility.maistra }} + + + + + + + + + + + + {{ range $data.versionRange }} + + + + + + + {{ end }} + +
MaistraSMCP CRKialiNotes
{{ .maistraVersion }}{{ .smcpCRVersion }}{{ .kialiVersion }}{{ .notes }}