Site | Status |
---|---|
istio.io | |
preliminary.istio.io | |
archive.istio.io |
istio.io
This repository contains the source code for the istio.io, preliminary.istio.io and archive.istio.io sites.
Please see the main Istio README file to learn about the overall Istio project and how to get in touch with us. To learn how you can contribute to any of the Istio components, please see the Istio contribution guidelines.
Editing and building
To learn how to edit and build this repo's content, please refer to Creating and Editing Pages.
Versions and releases
Istio maintains three variations of its public site.
-
istio.io is the main site, showing documentation for the current release of the product.
-
archive.istio.io contains snapshots of the documentation for previous releases of the product. This is useful for customers still using these older releases.
-
preliminary.istio.io contains the actively updated documentation for the next release of the product.
The user can trivially navigate between the different variations of the site using the gear menu in the top right of each page. All three sites are hosted on Netlify.
How versioning works
-
Documentation changes are primarily committed to the master branch of istio.io. Changes committed to this branch are automatically reflected on preliminary.istio.io.
-
The content of istio.io is taken from the latest release-XXX branch. The specific branch that is used is determined by the istio.io Netlify project's configuration.
-
The content of archive.istio.io is taken from the older release-XXX branches. The set of branches that are included on archive.istio.io is determined by the
TOBUILD
variable in this script.
Publishing content immediately
Checking in updates to the master branch will automatically update preliminary.istio.io, and will only be reflected on istio.io the next time a release is created, which can be several weeks in the future. If you'd like some changes to be immediately reflected on istio.io, you need to check your changes both to the master branch and to the current release branch (named release-XXX such as release-0.7).
This process can be taken care of automatically by our infrastructure. If you submit a PR
to the master branch and annotate the PR with the actions/merge-to-release-branch
label,
then as soon as your PR is merged into master, it will be merged into the current release branch.
Creating a version
Here are the steps necessary to create a new documentation version. Let's assume the current version of Istio is 0.6 and you wish to introduce 0.7 which has been under development.
Creating the release branch
-
Switch to the istio/istio.io repo and make sure everything is up to date.
-
Run
scripts/grab_reference_docs.sh
in order to get the latest reference docs. -
Edit the file
scripts/gen_archive_site.sh
and add the new archive version (in this case release-0.6) to theTOBUILD
variable. -
Edit the file
data/versions.yml
. Set thepreliminary
field to the next Istio release ("0.8") and themain
field to the current release ("0.7"). -
Commit the previous edits to your local git repo and push your master branch to GitHub.
-
Create a new release branch off of master, named as release-major.minor, which in this case would be release-0.7. There is one such branch for every release.
-
In the release branch you created, edit the file
data/args.yml
. Set thepreliminary
field tofalse
and thesource_branch_name
anddoc_branch_name
fields to the name of the branch, in this case release-0.7. -
In the release branch you created, edit the file
scripts/grab_reference_docs.sh
. Update the branch name foristio.git
andapi.git
to point to the release branch. In this case release-0.7. -
Commit the previous edit to your local git repo and push your release branch to GitHub.
Updating preliminary.istio.io
-
Switch to the istio/istio.io repo and make sure everything is up to date.
-
In the master branch, edit the file
data/args.yml
. Set theversion
andfull_version
fields to have the version of the next Istio release. In this case, you would set the fields to "0.8" and "0.8.0" respectively. -
In the master branch, edit the file
.mergify.yml
. Set thebranches
array to the name of the new release branch you just created. -
Commit the previous edits to your local git repo and push the master branch to GitHub.
-
Wait a while (~2 minutes) and browse preliminary.istio.io to make sure everything looks good.
Updating istio.io
-
Go to the istio.io project on Netlify
-
Change the branch that is built from the previous release's branch to the new release branch, in this case release-0.7
-
Select the option to trigger an immediate rebuild and redeployment.
-
Once deployment is done, browse istio.io and make sure everything looks good.
Updating archive.istio.io
-
Go to the Google Custom Search Engine and do the following:
-
Download the archive.istio.io CSE context file from the Advanced tab.
-
Add a new FacetItem at the top of the file containing the previous release's version number. In this case, this would be "V0.6".
-
Upload the updated CSE context file to the site.
-
In the Setup section, add a new site that covers the previous release's archive directory. In this case, the site URL would be archive.istio.io/v0.6/*. Set the label of this site to the name of the facet item created above (V0.6 in this case).
-
-
In the previous release's branch (in this case release-0.6), edit the file
data/args.yml
. Set thearchive
field to true and thearchive_date
field to the current date. -
In the previous release's branch (in this case release-0.6), edit the file
config.toml
. Set thedisableAliases
field tofalse
. -
Commit the previous edits to your local git repo and push the previous release's branch to GitHub.
-
Go to the archive.istio.io project on Netlify
-
Change the branch that is built from the previous release's branch to the new release branch, in this case release-0.7
-
Select the option to trigger an immediate rebuild and redeployment.
-
Once deployment is done, browse archive.istio.io and make sure everything looks good.
Creating a patch release
Creating a new patch release involves modifying a few files:
-
Create the release note boilerplate for the release by adding a markdown file in
content/boilarplates/notes/1.X.Y.md
, where 1.X.Y is the name of the release. This is where you describe the changes in the release. -
Create a release note page in
content/about/notes/1.X.Y/index.md
, where1.X.Y
is the name of the release. -
Create an announcement blog post in
content/blog/YYYY/announcing-1.X.Y/index.md
, whereYYYY
is the current year and1.x.Y
is the name of the release. -
Edit the
data/args.yml
file and change thefull_version
field to the name of the release. -
Run
scripts/grab_reference_docs.sh
to get the latest reference docs.
For the first three files, please look at existing files in the same locations for example content and layout.