Merge pull request #11022 from thockin/automated-cherry-pick-of-#10896-on-release-0.21

Automated cherry pick of #10896 on release 0.21

build/mark-new-version.sh

@@ -92,8 +92,13 @@ fi
 echo "+++ Versioning documentation and examples"
 
 # Update the docs to match this version.
-$SED -ri -e "s/HEAD/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/" docs/README.md
+DOCS_TO_EDIT=(docs/README.md examples/README.md)
-$SED -ri -e "s/HEAD/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/" examples/README.md
+for DOC in "${DOCS_TO_EDIT[@]}"; do
+  $SED -ri \
+      -e "s/HEAD/${NEW_VERSION}/" \
+      -e "/<!-- BEGIN STRIP_FOR_RELEASE -->/,/<!-- END STRIP_FOR_RELEASE -->/d" \
+      "${DOC}"
+done
 
 # Update API descriptions to match this version.
 $SED -ri -e "s|(releases.k8s.io)/HEAD|\1/${NEW_VERSION}|" pkg/api/v[0-9]*/types.go

docs/README.md

@@ -1,27 +1,28 @@
-# Kubernetes Documentation
+# Kubernetes Documentation: v0.21.1
 
-**Note**
-This documentation is current for 0.21.0.
 
-Documentation for previous releases is available in their respective branches:
+## Where to start
-   * [v0.19.0](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/release-0.19.0/docs)
-   * [v0.18.1](https://github.com/GoogleCloudPlatform/kubernetes/tree/release-0.18/docs)
-   * [v0.17.1](https://github.com/GoogleCloudPlatform/kubernetes/tree/release-0.17/docs)
 
-* The [User's guide](user-guide.md) is for anyone who wants to run programs and services on an existing Kubernetes cluster.
+* The [User's guide](user-guide.md) is for anyone who wants to run programs and
+  services on an existing Kubernetes cluster.
 
-* The [Cluster Admin's guide](cluster-admin-guide.md) is for anyone setting up a Kubernetes cluster or administering it.
+* The [Cluster Admin's guide](cluster-admin-guide.md) is for anyone setting up
+  a Kubernetes cluster or administering it.
 
-* The [Developer guide](developer-guide.md) is for anyone wanting to write programs that access the kubernetes API,
+* The [Developer guide](developer-guide.md) is for anyone wanting to write
- write plugins or extensions, or modify the core code of kubernetes.
+  programs that access the kubernetes API, write plugins or extensions, or
+  modify the core code of kubernetes.
 
-* The [Kubectl Command Line Interface](kubectl.md) is a detailed reference on the `kubectl` CLI.
+* The [Kubectl Command Line Interface](kubectl.md) is a detailed reference on
+  the `kubectl` CLI.
 
-* The [API object documentation](http://kubernetes.io/third_party/swagger-ui/) is a detailed description of all fields found in core API objects.
+* The [API object documentation](http://kubernetes.io/third_party/swagger-ui/)
+  is a detailed description of all fields found in core API objects.
 
 * An overview of the [Design of Kubernetes](design)
 
-* There are example files and walkthroughs in the [examples](../examples) folder.
+* There are example files and walkthroughs in the [examples](../examples)
+  folder.
 
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/README.md?pixel)]()

examples/README.md

@@ -1,14 +1,10 @@
-# Examples
+# Kubernetes Examples: v0.21.1
 
-This directory contains a number of different examples of how to run applications with Kubernetes.
 
-**Note**
+##
-This documentation is current for 0.21.0.  
 
-Examples for previous releases is available in their respective branches:
+This directory contains a number of different examples of how to run
-   * [v0.19.0](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/release-0.19.0/examples)
+applications with Kubernetes.
-   * [v0.18.1](https://github.com/GoogleCloudPlatform/kubernetes/tree/release-0.18/examples)
-   * [v0.17.1](https://github.com/GoogleCloudPlatform/kubernetes/tree/release-0.17/examples)
 
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/examples/README.md?pixel)]()