Automated merge

* upstream/main:
  Enhance Documentation: convert markdown file to AsciiDocs (istio-ecosystem#1118)
  fix(e2e): Add cleanup trap to prevent false positives in CI test runs (istio-ecosystem#1227)

Author: openshift-service-mesh-bot

Makefile.core.mk

@@ -229,12 +229,11 @@ test.e2e.kind: istioctl ## Deploy a KinD cluster and run the end-to-end tests ag
 test.e2e.describe: ## Runs ginkgo outline -format indent over the e2e test to show in BDD style the steps and test structure
 	GINKGO_FLAGS="$(GINKGO_FLAGS)" ${SOURCE_DIR}/tests/e2e/common-operator-integ-suite.sh --describe
 
-.PHONE: test.docs
-test.docs: runme istioctl ## Run the documentation examples tests.
-## test.docs use runme to test the documentation examples. 
+.PHONY: test.docs
+test.docs: istioctl ## Run the documentation examples tests.
 ## Check the specific documentation to understand the use of the tool
-	@echo "Running runme test on the documentation examples."
-	@PATH=$(LOCALBIN):$$PATH tests/documentation_tests/scripts/run-docs-examples.sh
+	@echo "Running test on the documentation examples."
+	@PATH=$(LOCALBIN):$$PATH tests/documentation_tests/scripts/run-asciidocs-test.sh
 	@echo "Documentation examples tested successfully"
 
 ##@ Build

docs/README.adoc

@@ -1,17 +1,25 @@
-[Return to Project Root](../README.md)
+// Variables embedded for GitHub compatibility
+:istio_latest_version: 1.26.3
+:istio_latest_version_revision_format: 1-26-3
+:istio_latest_tag: v1.26-latest
+:istio_latest_minus_one_version: 1.26.2
+:istio_latest_minus_one_version_revision_format: 1-26-2
 
-# Table of Contents
+link:../README.adoc[Return to Project Root]
 
-- [Addons](#addons)
-  - [Deploy Prometheus and Jaeger addons](#deploy-prometheus-and-jaeger-addons)
-  - [Deploy Kiali addon](#deploy-kiali-addon)
-  - [Find the active revision of your Istio instance. In our case it is `test`.](#find-the-active-revision-of-your-istio-instance)
-  - [Deploy Gateway and Bookinfo](#deploy-gateway-and-bookinfo)
-  - [Generate traffic and visualize your mesh](#generate-traffic-and-visualize-your-mesh)
+== Table of Contents
 
-## Addons
+- <<addons>>
+  - <<deploy-prometheus-and-jaeger-addons>>
+  - <<deploy-kiali-addon>>
+  - <<find-the-active-revision-of-your-istio-instance>>
+  - <<deploy-gateway-and-bookinfo>>
+  - <<generate-traffic-and-visualize-your-mesh>>
 
-Addons are managed separately from the Sail Operator. You can follow the [istio documentation](https://istio.io/latest/docs/ops/integrations/) for how to install addons. Below is an example of how to install some addons for Istio.
+[[addons]]
+== Addons
+
+Addons are managed separately from the Sail Operator. You can follow the link:https://istio.io/latest/docs/ops/integrations/[istio documentation] for how to install addons. Below is an example of how to install some addons for Istio.
 
 The sample will deploy:
 
@@ -25,26 +33,31 @@ The sample will deploy:
 - Sail operator is installed.
 - Control Plane is installed via the Sail Operator.
 
-### Deploy Prometheus and Jaeger addons
+[[deploy-prometheus-and-jaeger-addons]]
+=== Deploy Prometheus and Jaeger addons
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl apply -f https://raw.githubusercontent.com/istio/istio/master/samples/addons/prometheus.yaml
 kubectl apply -f https://raw.githubusercontent.com/istio/istio/master/samples/addons/jaeger.yaml
-```
+----
 
-### Deploy Kiali addon
+[[deploy-kiali-addon]]
+=== Deploy Kiali addon
 
 Install the kiali operator.
 
 You can install the kiali operator through OLM if running on Openshift, otherwise you can use helm:
 
-```bash
+[source,bash,subs="attributes+"]
+----
 helm install --namespace kiali-operator --create-namespace kiali-operator kiali/kiali-operator
-```
+----
 
 Create a Kiali resource. We're enabling tracing and disabling grafana here since tracing is disabled by default and grafana is not part of this example.
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl apply -f - <<EOF
 apiVersion: kiali.io/v1alpha1
 kind: Kiali
@@ -58,70 +71,81 @@ spec:
     grafana:
       enabled: false
 EOF
-```
+----
 
-### Find the active revision of your Istio instance.
+[[find-the-active-revision-of-your-istio-instance]]
+=== Find the active revision of your Istio instance.
 In our case it is `test` the istio resource name.
 
-```console
+[source,console,subs="attributes+"]
+----
 kubectl get istios
 NAME      REVISIONS   READY   IN USE   ACTIVE REVISION   STATUS    VERSION   AGE
-test      1           1       0        test              Healthy   v1.24.3   8m10s
-```
+test      1           1       0        test              Healthy   v{istio_latest_version}  8m10s
+----
 
-### Deploy Gateway and Bookinfo
+[[deploy-gateway-and-bookinfo]]
+=== Deploy Gateway and Bookinfo
 
 Create the bookinfo namespace (if it doesn't already exist) and enable injection.
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl create namespace bookinfo
 kubectl label namespace bookinfo istio.io/rev=test
-```
+----
 
 Install Bookinfo demo app.
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl apply -n bookinfo -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo.yaml
 kubectl apply -n bookinfo -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/platform/kube/bookinfo-versions.yaml
-```
+----
 
 Install gateway API CRDs if they are not already installed.
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \
   { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl apply -f -; }
-```
+----
 
 Create bookinfo gateway.
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl apply -n bookinfo -f https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/gateway-api/bookinfo-gateway.yaml
 kubectl wait -n bookinfo --for=condition=programmed gtw bookinfo-gateway
-```
+----
 
-### Generate traffic and visualize your mesh
+[[generate-traffic-and-visualize-your-mesh]]
+=== Generate traffic and visualize your mesh
 
 Send traffic to the productpage service. Note that this command will run until canceled.
 
-```bash
+[source,bash,subs="attributes+"]
+----
 export INGRESS_HOST=$(kubectl get gtw bookinfo-gateway -n bookinfo -o jsonpath='{.status.addresses[0].value}')
 export INGRESS_PORT=$(kubectl get gtw bookinfo-gateway -n bookinfo -o jsonpath='{.spec.listeners[?(@.name=="http")].port}')
 export GATEWAY_URL=$INGRESS_HOST:$INGRESS_PORT
 watch curl http://${GATEWAY_URL}/productpage &> /dev/null
-```
+----
 
 In a separate terminal, open Kiali to visualize your mesh.
 
 If using Openshift, open the Kiali route:
 
-```bash
+[source,bash,subs="attributes+"]
+----
 echo https://$(kubectl get routes -n istio-system kiali -o jsonpath='{.spec.host}')
-```
+----
 
 Otherwise, port forward to the kiali pod directly:
 
-```bash
+[source,bash,subs="attributes+"]
+----
 kubectl port-forward -n istio-system svc/kiali 20001:20001
-```
-<!-- markdown-link-check-disable-next-line -->
-You can view Kiali dashboard at: http://localhost:20001
+----
+
+You can view Kiali dashboard at: http://localhost:20001