diff --git a/docs/addons/addons.adoc b/docs/addons/addons.adoc index 3b0ccb46ed..13d1e20519 100644 --- a/docs/addons/addons.adoc +++ b/docs/addons/addons.adoc @@ -1,9 +1,9 @@ // 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 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/addons/observability.adoc b/docs/addons/observability.adoc index 1e6ef20887..94061d23a1 100644 --- a/docs/addons/observability.adoc +++ b/docs/addons/observability.adoc @@ -1,9 +1,9 @@ // 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 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/common/create-and-configure-gateways.adoc b/docs/common/create-and-configure-gateways.adoc index 597993863c..b79c6d1a7f 100644 --- a/docs/common/create-and-configure-gateways.adoc +++ b/docs/common/create-and-configure-gateways.adoc @@ -1,9 +1,9 @@ // 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 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/common/istio-ambient-mode.adoc b/docs/common/istio-ambient-mode.adoc index ac59d8b461..b43560f5df 100644 --- a/docs/common/istio-ambient-mode.adoc +++ b/docs/common/istio-ambient-mode.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/common/istio-ambient-waypoint.adoc b/docs/common/istio-ambient-waypoint.adoc index 9cc4724585..f1f77fb1ea 100644 --- a/docs/common/istio-ambient-waypoint.adoc +++ b/docs/common/istio-ambient-waypoint.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/deployment-models/consolidating-cp.adoc b/docs/deployment-models/consolidating-cp.adoc index bf7927f986..54301be999 100644 --- a/docs/deployment-models/consolidating-cp.adoc +++ b/docs/deployment-models/consolidating-cp.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] diff --git a/docs/deployment-models/multicluster.adoc b/docs/deployment-models/multicluster.adoc index 40b9e4fefa..f3f9775fe7 100644 --- a/docs/deployment-models/multicluster.adoc +++ b/docs/deployment-models/multicluster.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/deployment-models/multiple-mesh.adoc b/docs/deployment-models/multiple-mesh.adoc index 8fedffed72..a0b9c5dbcc 100644 --- a/docs/deployment-models/multiple-mesh.adoc +++ b/docs/deployment-models/multiple-mesh.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] diff --git a/docs/dual-stack/dual-stack.adoc b/docs/dual-stack/dual-stack.adoc index d0ee6c6200..d95d97f4e8 100644 --- a/docs/dual-stack/dual-stack.adoc +++ b/docs/dual-stack/dual-stack.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] diff --git a/docs/general/getting-started.adoc b/docs/general/getting-started.adoc index 274df48e3b..f41a0d2d32 100644 --- a/docs/general/getting-started.adoc +++ b/docs/general/getting-started.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../README.adoc[Return to Project Root] diff --git a/docs/general/istiod-ha.adoc b/docs/general/istiod-ha.adoc index e323e0ce72..3317ccdf0c 100644 --- a/docs/general/istiod-ha.adoc +++ b/docs/general/istiod-ha.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] diff --git a/docs/general/plugin-ca.adoc b/docs/general/plugin-ca.adoc index e27ad42159..0795c37aa0 100644 --- a/docs/general/plugin-ca.adoc +++ b/docs/general/plugin-ca.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] diff --git a/docs/guidelines/guidelines.adoc b/docs/guidelines/guidelines.adoc index 9af16a9e6b..0399dcf5a1 100644 --- a/docs/guidelines/guidelines.adoc +++ b/docs/guidelines/guidelines.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] @@ -97,12 +97,12 @@ Use code blocks for commands or groups of commands that have the same context. * All AsciiDoc files should include variable definitions at the top for GitHub compatibility: ``` // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 ``` Note: that the values of the variables will be automatically updated on each release to keep them in sync with the actual versions. diff --git a/docs/update-strategy/update-strategy.adoc b/docs/update-strategy/update-strategy.adoc index 5be9bc0890..3fce8743b8 100644 --- a/docs/update-strategy/update-strategy.adoc +++ b/docs/update-strategy/update-strategy.adoc @@ -1,10 +1,10 @@ // 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_release_name: release-1.26 -:istio_latest_minus_one_version: 1.26.2 -:istio_latest_minus_one_version_revision_format: 1-26-2 +:istio_latest_version: 1.28.0 +:istio_latest_version_revision_format: 1-28-0 +:istio_latest_tag: v1.28-latest +:istio_release_name: release-1.28 +:istio_latest_minus_one_version: 1.27.3 +:istio_latest_minus_one_version_revision_format: 1-27-3 link:../../README.adoc[Return to Project Root] diff --git a/hack/update-istio-in-docs.sh b/hack/update-istio-in-docs.sh new file mode 100755 index 0000000000..6b13a03a8d --- /dev/null +++ b/hack/update-istio-in-docs.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +# Copyright Istio Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -euo pipefail + +YAML_FILE="pkg/istioversion/versions.yaml" + +SED_CMD="sed" +if [[ "$(uname)" == "Darwin" ]]; then + SED_CMD="gsed" +fi + +# Check if yq is installed +if ! command -v yq &> /dev/null +then + echo "Error: 'yq' command not found." >&2 + echo "Please install yq (e.g., 'brew install yq' or 'sudo snap install yq')." >&2 + exit 1 +fi + +echo "Extracting the latest two 'version' values from $YAML_FILE..." + +LATEST_VERSIONS=$(yq '.versions[] | select(.version) | .version' "$YAML_FILE" | head -n 2) +if [ -z "$LATEST_VERSIONS" ]; then + echo "No versions with a 'version' property found." + exit 1 +fi + +echo "$LATEST_VERSIONS" + +# Check all the ascii docs in docs/ and update the istio version variables +# LATEST_VERSIONS[0] is latest and LATEST_VERSIONS[1] is latest minus one +LATEST_VERSION=$(echo "$LATEST_VERSIONS" | sed -n '1p') +LATEST_VERSION_REVISION_FORMAT=$(echo "$LATEST_VERSION" | tr '.' '-') +LATEST_TAG="v${LATEST_VERSION%.*}-latest" +LATEST_RELEASE_NAME="release-${LATEST_VERSION%.*}" +LATEST_MINUS_ONE_VERSION=$(echo "$LATEST_VERSIONS" | sed -n '2p') +LATEST_MINUS_ONE_VERSION_REVISION_FORMAT=$(echo "$LATEST_MINUS_ONE_VERSION" | tr '.' '-') +echo "The versions to update are:" +echo "LATEST_VERSION: $LATEST_VERSION" +echo "LATEST_VERSION_REVISION_FORMAT: $LATEST_VERSION_REVISION_FORMAT" +echo "LATEST_TAG: $LATEST_TAG" +echo "LATEST_RELEASE_NAME: $LATEST_RELEASE_NAME" +echo "LATEST_MINUS_ONE_VERSION: $LATEST_MINUS_ONE_VERSION" +echo "LATEST_MINUS_ONE_VERSION_REVISION_FORMAT: $LATEST_MINUS_ONE_VERSION_REVISION_FORMAT" + +for file in docs/**/*.adoc; do + echo "Updating file: $file" + "$SED_CMD" -i -E "s/(:istio_latest_version: ).*/\1$LATEST_VERSION/" "$file" + "$SED_CMD" -i -E "s/(:istio_latest_version_revision_format: ).*/\1$LATEST_VERSION_REVISION_FORMAT/" "$file" + "$SED_CMD" -i -E "s/(:istio_latest_tag: ).*/\1$LATEST_TAG/" "$file" + "$SED_CMD" -i -E "s/(:istio_release_name: ).*/\1$LATEST_RELEASE_NAME/" "$file" + "$SED_CMD" -i -E "s/(:istio_latest_minus_one_version: ).*/\1$LATEST_MINUS_ONE_VERSION/" "$file" + "$SED_CMD" -i -E "s/(:istio_latest_minus_one_version_revision_format: ).*/\1$LATEST_MINUS_ONE_VERSION_REVISION_FORMAT/" "$file" +done +echo "Documentation files updated successfully." \ No newline at end of file diff --git a/tools/update_deps.sh b/tools/update_deps.sh index fdcb8f66ac..dd26b383cb 100755 --- a/tools/update_deps.sh +++ b/tools/update_deps.sh @@ -117,6 +117,8 @@ else echo "No latest version found for kindest/node on Docker Hub. Keeping the existing KIND_IMAGE." fi +# Update Istio versions in the Documentation files +./hack/update-istio-in-docs.sh # Regenerate files make update-istio gen