Skip to content

Commit

Permalink
Fix LeftHand TOC issue (caused by readfile) (#714)
Browse files Browse the repository at this point in the history
- replace readfile with custom shortcode for maistra compat be like
  what we have for istio compat
- fix weights for Installation section
  • Loading branch information
jshaughn authored Nov 3, 2023
1 parent d049881 commit 5af4989
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 16 deletions.
2 changes: 1 addition & 1 deletion content/en/docs/Installation/installation-guide/_index.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Prerequisites"
description: "Hardware and Software compatibility and requirements."
weight: 10
weight: 15
---

## Istio
Expand Down Expand Up @@ -44,7 +44,7 @@ supported Istio versions.

## Maistra Version Compatibility

{{% readfile file="/content/en/docs/Installation/installation-guide/compatibility-maistra.md" %}}
{{<compat-table-maistra>}}

<br />

Expand Down
43 changes: 43 additions & 0 deletions data/compatibility/maistra.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# The Compatible Version Matrix between Maistra and Kiali
# See: content/en/docs/Installation/installation-guide/prerequisites.md -> {{<compat-table-maistra>}}
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."
22 changes: 22 additions & 0 deletions layouts/shortcodes/compat-table-maistra.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{{ $data := index .Site.Data.compatibility.maistra }}

<table border="1">
<thead>
<tr>
<th style="width:80px">Maistra</th>
<th style="width:80px">SMCP CR</th>
<th style="width:70px">Kiali</th>
<th>Notes</th>
</tr>
</thead>
<tbody>
{{ range $data.versionRange }}
<tr>
<td>{{ .maistraVersion }}</td>
<td>{{ .smcpCRVersion }}</td>
<td>{{ .kialiVersion }}</td>
<td>{{ .notes }}</td>
</tr>
{{ end }}
</tbody>
</table>

0 comments on commit 5af4989

Please sign in to comment.