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
The above means that if you want to do a change to the main istio.io site, you need to make the change in the master branch of https://github.com/istio/istio.io and then merge that change into the current release branch.
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).
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.
-
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. -
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/releases.yml
and add a new entry at the top of the file for version 0.8. You'll need to make sure the URLs are updated for the first few entries. The top entry (0.8) should point to preliminary.istio.io. The second entry (0.7) should point to istio.io. The third and subsequent entries should point to archive.istio.io. -
In the master branch, edit the file
data/args.yml
and update 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. -
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
-
Switch to the istio/istio.io repo and make sure everything is up to date.
-
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. -
Commit the previous edit to your local git repo and push the *previous release's branch to GitHub.
-
Switch to the istio/admin-sites repo.
-
Edit the
archive.istio.io/build.sh
script to add the newest archive version (in this case release-0.6) to theTOBUILD
variable. -
Commit the previous edit to your local git repo and push the change to GitHub.
-
Wait a while (~10 minutes) and browse archive.istio.io and make sure everything looks good.