Merge pull request #10096 from brendandburns/merge-release-0.19-to-master

build/mark-new-version.sh

@@ -91,19 +91,21 @@ fi
 
 VERSION_FILE="${KUBE_ROOT}/pkg/version/base.go"
 
-RELEASE_DIR=release-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
-echo "+++ Cloning documentation and examples into ${RELEASE_DIR}/..."
-mkdir ${RELEASE_DIR}
-cp -r docs ${RELEASE_DIR}/docs
-cp -r examples ${RELEASE_DIR}/examples
-
-# Update the docs to match this version.
-perl -pi -e "s/HEAD/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/" ${RELEASE_DIR}/docs/README.md
-perl -pi -e "s/HEAD/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/" ${RELEASE_DIR}/examples/README.md
-
-${KUBE_ROOT}/hack/run-gendocs.sh
-git add ${RELEASE_DIR}
-git commit -m "Cloning docs for ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
+if [[ "${VERSION_PATCH}" == "0" ]]; then
+  RELEASE_DIR=release-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
+  echo "+++ Cloning documentation and examples into ${RELEASE_DIR}/..."
+  mkdir ${RELEASE_DIR}
+  cp -r docs ${RELEASE_DIR}/docs
+  cp -r examples ${RELEASE_DIR}/examples
+
+  # Update the docs to match this version.
+  perl -pi -e "s/HEAD/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/" ${RELEASE_DIR}/docs/README.md
+  perl -pi -e "s/HEAD/${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/" ${RELEASE_DIR}/examples/README.md
+
+  ${KUBE_ROOT}/hack/run-gendocs.sh
+  git add ${RELEASE_DIR}
+  git commit -m "Cloning docs for ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
+fi
 
 GIT_MINOR="${VERSION_MINOR}.${VERSION_PATCH}"
 echo "+++ Updating to ${NEW_VERSION}"

pkg/version/base.go

@@ -36,8 +36,8 @@ package version
 var (
 	// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
 	gitMajor     string = "0"              // major version, always numeric
-	gitMinor     string = "19.0+"          // minor version, numeric possibly followed by "+"
-	gitVersion   string = "v0.19.0-dev"    // version from git, output of $(git describe)
+	gitMinor     string = "19.1+"          // minor version, numeric possibly followed by "+"
+	gitVersion   string = "v0.19.1-dev"    // version from git, output of $(git describe)
 	gitCommit    string = ""               // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
 )