Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asciidoc/components/system-upgrade-controller.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,14 @@ Make sure that the version of the fleet-cli you download matches the version of
+
[,bash,subs="attributes"]
----
curl -L -o fleet-cli https://github.com/rancher/fleet/releases/download/v{version-fleet}/fleet-linux-amd64
curl -L -o fleet-cli https://github.com/rancher/fleet/releases/download/{version-fleet}/fleet-linux-amd64
----

*** Linux ARM:
+
[,bash,subs="attributes"]
----
curl -L -o fleet-cli https://github.com/rancher/fleet/releases/download/v{version-fleet}/fleet-linux-arm64
curl -L -o fleet-cli https://github.com/rancher/fleet/releases/download/{version-fleet}/fleet-linux-arm64
----

. Make `fleet-cli` executable:
Expand Down
16 changes: 0 additions & 16 deletions asciidoc/concepts/observability.adoc

This file was deleted.

21 changes: 0 additions & 21 deletions asciidoc/concepts/terms.adoc

This file was deleted.

6 changes: 3 additions & 3 deletions asciidoc/day2/fleet-helm-upgrade.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Depending on what your environment supports, you can take one of the following o

. Host your chart's Fleet resources on a local Git server that is accessible by your `management cluster`.

. Use Fleet's CLI to link:https://fleet.rancher.io/bundle-add#convert-a-helm-chart-into-a-bundle[convert a Helm chart into a Bundle] that you can directly use and will not need to be hosted somewhere. Fleet's CLI can be retrieved from their link:https://github.com/rancher/fleet/releases/tag/v{version-fleet}[release] page, for Mac users there is a link:https://formulae.brew.sh/formula/fleet-cli[fleet-cli] Homebrew Formulae.
. Use Fleet's CLI to link:https://fleet.rancher.io/bundle-add#convert-a-helm-chart-into-a-bundle[convert a Helm chart into a Bundle] that you can directly use and will not need to be hosted somewhere. Fleet's CLI can be retrieved from their link:https://github.com/rancher/fleet/releases/tag/{version-fleet}[release] page, for Mac users there is a link:https://formulae.brew.sh/formula/fleet-cli[fleet-cli] Homebrew Formulae.

==== Find the required assets for your Edge release version

Expand Down Expand Up @@ -418,7 +418,7 @@ endif::[]
+
[NOTE]
====
Fleet's CLI can be retrieved from their link:https://github.com/rancher/fleet/releases/tag/v{version-fleet}[release] *Assets* page (`fleet-linux-amd64`).
Fleet's CLI can be retrieved from their link:https://github.com/rancher/fleet/releases/tag/{version-fleet}[release] *Assets* page (`fleet-linux-amd64`).

For Mac users there is a link:https://formulae.brew.sh/formula/fleet-cli[fleet-cli] Homebrew Formulae.
====
Expand Down Expand Up @@ -593,7 +593,7 @@ Make sure that the Fleet includes the changes that have been made by the `genera

. For an environment that does not support GitOps (e.g. is air-gapped and does not allow local Git server usage):

.. Download the `fleet-cli` binary from the `rancher/fleet` link:https://github.com/rancher/fleet/releases/tag/v{version-fleet}[release] page (`fleet-linux-amd64` for Linux). For Mac users, there is a Homebrew Formulae that can be used - link:https://formulae.brew.sh/formula/fleet-cli[fleet-cli].
.. Download the `fleet-cli` binary from the `rancher/fleet` link:https://github.com/rancher/fleet/releases/tag/{version-fleet}[release] page (`fleet-linux-amd64` for Linux). For Mac users, there is a Homebrew Formulae that can be used - link:https://formulae.brew.sh/formula/fleet-cli[fleet-cli].

.. Navigate to the `eib-charts-upgrader` Fleet:
+
Expand Down
11 changes: 0 additions & 11 deletions asciidoc/edge-book/edge.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ include::../tips/metal3.adoc[leveloffset=+1]
[partintro]
How to integrate third-party tools

// include::../integrations/linkerd.adoc[leveloffset=+1]

include::../integrations/nats.adoc[leveloffset=+1]

include::../integrations/nvidia-slemicro.adoc[leveloffset=+1]
Expand Down Expand Up @@ -227,12 +225,3 @@ include::../troubleshooting/collecting-diagnostics-for-support.adoc[]

include::./releasenotes.adoc[leveloffset=+2]

// include::./version-matrix.adoc[leveloffset=+2]

// Additional information

// include::../concepts/observability.adoc[leveloffset=+2]

// include::../concepts/terms.adoc[leveloffset=+2]


40 changes: 0 additions & 40 deletions asciidoc/edge-book/version-matrix.adoc

This file was deleted.

50 changes: 22 additions & 28 deletions asciidoc/edge-book/versions.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// NOTE - Generated by versions.adoc.j2, do not modify versions.adoc directly!

// ============================================================================
:revdate: 2026-01-13
:revdate: 2026-03-23
:page-revdate: {revdate}
// Automatic Version Substitutions
//
Expand All @@ -17,7 +19,7 @@
:version-mlm: 5.0.6

// == Edge Image Builder ==
:version-eib: 1.3.2
:version-eib: 1.3.3
:version-eib-api-latest: 1.3

// KubeVirt
Expand All @@ -27,16 +29,15 @@
:version-kubevirt-release: v0.6.0

// == Component Versions ==
:version-rancher-prime: 2.13.1
:version-rancher-prime: 2.13.3
:version-cert-manager: 1.19.2
:version-elemental-operator: 1.8.0
:version-longhorn: 1.10.1
:version-elemental-operator: 1.8.1
:version-longhorn: 1.10.2
:version-neuvector: 5.4.8
:version-kubevirt: 1.5.2
:version-kubevirt: 0.6.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this attribute is unused so can be removed, but the version-kubevirt-release above is wrong, we need to reference the upstream version which isn't actually the +up in this case

:version-endpoint-copier-operator: 0.3.0
:version-suc: 0.17.0
:version-nm-configurator: 0.3.5
:version-fleet: 0.14.1
:version-suc: v0.17.0
:version-fleet: v0.14.3
:version-cdi: 0.6.0
:version-nvidia-device-plugin: 0.14.5
:version-kiwi-builder: 10.2.29.1
Expand All @@ -46,15 +47,14 @@

// == Non-Release Manifest Charts ==
:version-suc-chart: 108.0.0
:version-upgrade-controller-chart: 305.0.3+up0.1.3
:version-upgrade-controller-chart: 305.0.3_up0.1.3
:version-nvidia-device-plugin-chart: v0.14.5

// == Release Tags ==
:release-tag-eib: release-1.3
:release-tag-edge-charts: release-3.5
:release-tag-telco-cloud: release-3.5
:release-tag-fleet-examples: release-3.5.0
:release-tag-rancher: v2.13.1
:release-tag-fleet-examples: release-3.5.1
:release-tag-rancher: v2.13.3


// ============================================================================
Expand All @@ -64,29 +64,23 @@
// and should not be renamed without thinking through the implications.
// ============================================================================

:version-kubernetes-k3s: v1.34.2+k3s1
:version-kubernetes-rke2: v1.34.2+rke2r1
:version-kubernetes-k3s: v1.34.4+k3s1
:version-kubernetes-rke2: v1.34.4+rke2r1

:version-operatingsystem: 6.2

:version-akri-chart: 305.0.0+up0.12.20
:version-akri-dashboard-extension-chart: 305.0.4+up1.3.2
:version-cdi-chart: 305.0.1+up0.6.0
:version-elemental-operator-chart: 1.8.0
:version-elemental-operator-crds-chart: 1.8.0
:version-endpoint-copier-operator-chart: 305.0.1+up0.3.0
:version-fleet-chart: 108.0.1+up0.14.1
:version-kubevirt-chart: 305.0.1+up0.6.0
:version-kubevirt-dashboard-extension-chart: 305.0.4+up1.3.3
:version-longhorn-chart: 1.10.1
:version-longhorn-docs: 1.10.1
:version-metal3-chart: 305.0.21+up0.13.0
:version-longhorn-chart: 1.10.2
:version-longhorn-crd-chart:
:version-longhorn-docs: 1.10.2
:version-metal3-chart: 305.0.23+up0.13.1
:version-metallb-chart: 305.0.1+up0.15.2
:version-neuvector-chart: 108.0.1+up2.8.10
:version-neuvector-crd-chart: 108.0.1+up2.8.10
:version-neuvector-dashboard-extension-chart: 2.1.5
:version-rancher-chart: 2.13.1
:version-rancher-turtles-providers-chart: 305.0.4+up0.25.1
:version-neuvector-chart: 108.0.2+up2.8.11
:version-neuvector-crd-chart: 108.0.2+up2.8.11
:version-rancher-turtles-providers-chart: 305.0.5+up0.25.4
:version-sriov-crd-chart: 305.0.4+up1.6.0
:version-sriov-network-operator-chart: 305.0.4+up1.6.0
:version-sriov-upstream: 1.6.0
Expand Down
147 changes: 147 additions & 0 deletions asciidoc/edge-book/versions.adoc.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
// NOTE - Generated by versions.adoc.j2, do not modify versions.adoc directly!
{% set release_manifest_edge_version = spec.releaseVersion %}
{%- set release_manifest_edge_version_short = spec.releaseVersion.split(".")[:2] | join(".") %}
{%- set release_manifest_rke2_version = spec.components.kubernetes.rke2.version %}
{%- set release_manifest_k3s_version = spec.components.kubernetes.k3s.version %}
{%- set release_manifest_slmicro_version = spec.components.operatingSystem.version %}
{%- set release_manifest_rancher_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "rancher") | map(attribute="version") | list | first %}
{%- set release_manifest_longhorn_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "longhorn") | map(attribute="version") | list | first %}
{%- set release_manifest_longhorn_crd_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "longhorn") | map(attribute="dependencyCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_neuvector_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "neuvector") | map(attribute="version") | list | first %}
{%- set release_manifest_neuvector_crd_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "neuvector") | map(attribute="dependencyCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_neuvector_dashboard_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "neuvector") | map(attribute="addonCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_chart_major = release_manifest_edge_version_short | replace(".", "0") %}
{%- set release_manifest_metallb_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "metallb") | map(attribute="version") | list | first %}
{%- set release_manifest_eco_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "endpoint-copier-operator") | map(attribute="version") | list | first %}
{%- set release_manifest_cdi_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "cdi") | map(attribute="version") | list | first %}
{%- set release_manifest_akri_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "akri") | map(attribute="version") | list | first %}
{%- set release_manifest_akri_dashboard_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "akri") | map(attribute="addonCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_metal3_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "metal3") | map(attribute="version") | list | first %}
{%- set release_manifest_kubevirt_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "kubevirt") | map(attribute="version") | list | first %}
{%- set release_manifest_kubevirt_dashboard_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "kubevirt") | map(attribute="addonCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_elemental_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "elemental-operator") | map(attribute="version") | list | first %}
{%- set release_manifest_elemental_crd_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "elemental-operator") | map(attribute="dependencyCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_elemental_dashboard_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "elemental-operator") | map(attribute="addonCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_sriov_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "sriov-network-operator") | map(attribute="version") | list | first %}
{%- set release_manifest_sriov_crd_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "sriov-network-operator") | map(attribute="dependencyCharts") | first | map(attribute="version") | list | first %}
{%- set release_manifest_turtles_providers_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "rancher-turtles-providers") | map(attribute="version") | list | first %}
{%- set release_manifest_cert_manager_version = spec.components.workloads.helm | selectattr("releaseName", "equalto", "cert-manager") | map(attribute="version") | list | first %}
// ============================================================================
:revdate: %%REVDATE%%
:page-revdate: {revdate}
// Automatic Version Substitutions
//
// The values in here are used throughout the documentation. Updating them here
// will propagate throughout the rest of the documentation. See the section at
// the bottom for details on versioning instances that cannot be handled in this
// fashion.
// ============================================================================

// == General Edge ==
:version-edge: {{ release_manifest_edge_version_short }}
:version-edge-registry: {{ release_manifest_edge_version_short }}

// == Multi-Linux Manager ==
:version-mlm: 5.0.6

// == Edge Image Builder ==
:version-eib: {{ version_eib }}
:version-eib-api-latest: 1.3

// KubeVirt
// This is used in download URLs and filenames from upstream, so it must have
// the leading "v". If needed, a separate version-kubevirt should be created
// with simply the version number itself.
:version-kubevirt-release: v{{ release_manifest_kubevirt_version .split("+up") | last }}

// == Component Versions ==
:version-rancher-prime: {{ release_manifest_rancher_version }}
:version-cert-manager: {{ release_manifest_cert_manager_version }}
:version-elemental-operator: {{ release_manifest_elemental_version }}
:version-longhorn: {{ release_manifest_longhorn_version.split("+up") | last }}
:version-neuvector: 5.4.8
:version-kubevirt: {{ release_manifest_kubevirt_version .split("+up") | last }}
:version-endpoint-copier-operator: {{ release_manifest_eco_version.split("+up") | last }}
:version-suc: {{ version_suc }}
:version-fleet: {{ version_fleet }}
:version-cdi: {{ release_manifest_cdi_version.split("+up") | last }}
:version-nvidia-device-plugin: 0.14.5
:version-kiwi-builder: {{ version_kiwi_builder }}

// == Nessie ==
:version-nessie: {{ version_nessie }}

// == Non-Release Manifest Charts ==
:version-suc-chart: {{ version_suc_chart }}
:version-upgrade-controller-chart: {{ version_upgrade_controller_chart }}
:version-nvidia-device-plugin-chart: v0.14.5

// == Release Tags ==
:release-tag-eib: release-1.3
:release-tag-telco-cloud: release-{{ release_manifest_edge_version_short }}
:release-tag-fleet-examples: release-{{ release_manifest_edge_version }}
:release-tag-rancher: v{{ release_manifest_rancher_version }}


// ============================================================================
// Release Manifest Versions
//
// The following are derived from the `releaseName` field of the release manifest
// and should not be renamed without thinking through the implications.
// ============================================================================

:version-kubernetes-k3s: {{ release_manifest_k3s_version }}
:version-kubernetes-rke2: {{ release_manifest_rke2_version }}

:version-operatingsystem: {{ release_manifest_slmicro_version }}

:version-cdi-chart: {{ release_manifest_cdi_version }}
:version-endpoint-copier-operator-chart: {{ release_manifest_eco_version }}
:version-kubevirt-chart: {{ release_manifest_kubevirt_version }}
:version-kubevirt-dashboard-extension-chart: {{ release_manifest_kubevirt_dashboard_version }}
:version-longhorn-chart: {{ release_manifest_longhorn_version }}
:version-longhorn-crd-chart: {{ release_manifest_longhorn_crd_version }}
:version-longhorn-docs: {{ release_manifest_longhorn_version.split("+up") | last }}
:version-metal3-chart: {{ release_manifest_metal3_version }}
:version-metallb-chart: {{ release_manifest_metallb_version }}
:version-neuvector-chart: {{ release_manifest_neuvector_version }}
:version-neuvector-crd-chart: {{ release_manifest_neuvector_crd_version }}
:version-rancher-turtles-providers-chart: {{ release_manifest_turtles_providers_version }}
:version-sriov-crd-chart: {{ release_manifest_sriov_crd_version }}
:version-sriov-network-operator-chart: {{ release_manifest_sriov_version }}
:version-sriov-upstream: {{ release_manifest_sriov_version.split("+up") | last }}

// capi-provider-metal3
// edu, Oct 9, 2025 :: Used to link the CRDs on the docs site like
// https://doc.crds.dev/github.com/metal3-io/cluster-api-provider-metal3/infrastructure.cluster.x-k8s.io/Metal3MachineTemplate/v1beta1@v1.11.0#spec-template-spec-hostSelector-matchLabels
:version-capi-provider-metal3: v1beta1@v1.10.2

// ============================================================================
// Derived Version Entries
//
// The following are derived from previously defined versions, ensure they
// are not using elements defined below them
//
// ============================================================================

// == SUSE Linux Micro ==
:micro-base-image-raw: SL-Micro.x86_64-{version-operatingsystem}-Base-GM.raw
:micro-base-rt-image-raw: SL-Micro.x86_64-{version-operatingsystem}-Base-RT-GM.raw
:micro-base-rt-image-iso: SL-Micro.x86_64-{version-operatingsystem}-Base-RT-SelfInstall-GM.install.iso
:micro-base-image-iso: SL-Micro.x86_64-{version-operatingsystem}-Base-SelfInstall-GM.install.iso
:micro-default-image-iso: SL-Micro.x86_64-{version-operatingsystem}-Default-SelfInstall-GM.install.iso


// ============================================================================
// Manual Version Entries
//
// The following files mention versions that cannot be handled through
// substitution. For example, EIB definitions that contain a list of
// images to embed. These files should be manually reviewed on a per-release
// basis to ensure accuracy.
// ============================================================================

// asciidoc/guides/air-gapped-eib-deployments.adoc
// asciidoc/product/atip-management-cluster.adoc
// asciidoc/product/atip-automated-provision.adoc
// asciidoc/edge-book/releasenotes.adoc
Loading
Loading